gtkutil.c (xg_display_open): Assign a value to gdpy_def, check

that gdpy is set.

diff --git a/src/gtkutil.c b/src/gtkutil.c
index 8e3e24b6225f531144c2eb97bb7f6e3ec9718d68..6d73c0358f070da317403e8e022f5ce9c42d853a 100644 (file)
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -119,9 +119,12 @@ xg_display_open (display_name, dpy)
   GdkDisplay *gdpy;
 
   gdpy = gdk_display_open (display_name);
-  if (!gdpy_def)
-    gdk_display_manager_set_default_display (gdk_display_manager_get (),
-                                            gdpy);
+  if (!gdpy_def && gdpy)
+    {
+      gdpy_def = gdpy;
+      gdk_display_manager_set_default_display (gdk_display_manager_get (),
+                                              gdpy);
+    }
 
   *dpy = gdpy ? GDK_DISPLAY_XDISPLAY (gdpy) : NULL;
   return gdpy != NULL;